Show disabled agents by default
Akinori MUSHA
2 changed files with 4 additions and 4 deletions
+ 1
- 1
app/controllers/diagrams_controller.rb
@@ -7,7 +7,7 @@ class DiagramsController < ApplicationController |
||
| 7 | 7 |
agents = current_user.agents |
| 8 | 8 |
end |
| 9 | 9 |
@disabled_agents = agents.inactive |
| 10 |
- agents = agents.active unless params[:include_disabled].present? |
|
| 10 |
+ agents = agents.active if params[:exclude_disabled].present? |
|
| 11 | 11 |
@agents = agents.includes(:receivers) |
| 12 | 12 |
end |
| 13 | 13 |
end |
+ 3
- 3
app/views/diagrams/show.html.erb
@@ -11,10 +11,10 @@ |
||
| 11 | 11 |
<div class="btn-group"> |
| 12 | 12 |
<%= link_to icon_tag('glyphicon-chevron-left') + ' Back'.html_safe, (@scenario ? scenario_path(@scenario) : agents_path), class: "btn btn-default" %>
|
| 13 | 13 |
<% if (num_disabled = @disabled_agents.count).nonzero? -%> |
| 14 |
- <% if params[:include_disabled] %> |
|
| 15 |
- <%= link_to @scenario ? scenario_diagram_path(@scenario) : diagram_path, class: 'btn btn-default' do %><%= icon_tag('glyphicon-eye-close') %> Hide <%= pluralize(num_disabled, 'disabled Agent') %><% end %>
|
|
| 14 |
+ <% if params[:exclude_disabled] %> |
|
| 15 |
+ <%= link_to @scenario ? scenario_diagram_path(@scenario) : diagram_path, class: 'btn btn-default' do %><%= icon_tag('glyphicon-eye-open') %> Show <%= pluralize(num_disabled, 'disabled Agent') %><% end %>
|
|
| 16 | 16 |
<% else %> |
| 17 |
- <%= link_to @scenario ? scenario_diagram_path(@scenario, include_disabled: true) : diagram_path(include_disabled: true), class: 'btn btn-default' do %><%= icon_tag('glyphicon-eye-open') %> Show <%= pluralize(num_disabled, 'disabled Agent') %><% end %>
|
|
| 17 |
+ <%= link_to @scenario ? scenario_diagram_path(@scenario, exclude_disabled: true) : diagram_path(exclude_disabled: true), class: 'btn btn-default' do %><%= icon_tag('glyphicon-eye-close') %> Hide <%= pluralize(num_disabled, 'disabled Agent') %><% end %>
|
|
| 18 | 18 |
<% end %> |
| 19 | 19 |
<% end %> |
| 20 | 20 |
</div> |